Create gh-pages branch via GitHub
Merge branch 'gh-pages' of github.com:1024bit/jhub
Create gh-pages branch via GitHub
Merge branch 'gh-pages' of github.com:1024bit/jhub

Conflicts:
	index.html
	params.json
update