Merging gh-pages with master to update website