merge gh-pages
move to branch master