Merging master and github pages branches