Merge remote-tracking branch 'origin/gh-pages'
cleaning up this mess
updated and simplified page
Merge branch 'master' into gh-pages