Merge branch 'gh-pages'
cleaned up the classic branch
Merge branch 'classic' into gh-pages