Merge branch 'gh-pages'
Finished page templates and minor CSS changes
Merge branch 'master' into gh-pages