Merge branch 'gh-pages'
Updated top margin of WIP header
Merge branch 'master' into gh-pages