New theme added for testing - Marko Test Theme
changing index.php file
change to index.php on master branch
change to index.php on themedev branch
Resolved merge conflict on index.php