merging gh-pages with master