Made the layout from gh-pages the default layout
Merging conflicts