merging gh pages and master