Create gh-pages branch via GitHub
clean repo
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
merge
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	js/main.js
Merge branch 'master' into gh-pages