Merge branch 'gh-pages'
newly created
removed www
Merge branch 'master' into gh-pages