Good solid progress
Merge branch 'origin/gh-pages'
git fixed