merge master and gh pages