merge gh pages and master