Merge branch 'master' into gh-pages
Delete needless files
Merge branch 'gh-pages'