Merging master and gh pages