Merging gh-pages with public version