Merging gh-pages