Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Merge branch 'gh-pages'

* gh-pages:
  Create gh-pages branch via GitHub
  Create gh-pages branch via GitHub
  Create gh-pages branch via GitHub

Conflicts:
	index.html
no message
no message
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update index.html