Create gh-pages branch via GitHub
merge conflicts
these are edits on gh-pages