Merge branch 'master' into gh-pages
Consolidating CSS; Changed body font.
Merge branch 'gh-pages'