merging master in ghpages