Merge branch 'gh-pages'
Replaced 2 spaces with a tab
Overhaul
Merge branch 'master' into gh-pages