Merging gh-pages and master