Merging gh-pages with master