Update master from gh-pages

I want to update the master branch from gh-pages and remove the gh-pages branches.