Create gh-pages branch via GitHub
fixing merge conflicts