Create gh-pages branch via GitHub
initial commit
fixed conflict in merge