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