Merge branch 'master' into gh-pages
Updating font size to match caps
Merge branch 'gh-pages'