replaced a lot of default content
added if statement to site logo to accommodate logo-less layouts
Merge branch 'gh-pages-fork' into gh-pages