+<<<<<<< HEAD
<?php\r
// This file will generate and return the main page of the site\r
$CONF = array();\r
include('./config.php');\r
\r
selector();\r
+=======
+<?php
+// This file will generate and return the main page of the site
+$CONF = array();
+$CONF['Self'] = 'index.php';
+
+include('./config.php');
+
+selector();
+
+>>>>>>> skinnable-master