Merge branch 'gh-pages'
text edits
previous screw up fixed
Merge branch 'master' into gh-pages