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

Conflicts:
	css/stylesheet.css
	index.html
	params.json