Remove gh-pages files
Merge branch 'master' into gh-pages