Merge branch 'master' into gh-pages
Minor color and margin updates to the index page
Merge branch 'gh-pages'