Merge branches 'gh-pages' and 'master' of https://github.com/gcontino/gxtest

Conflicts:
	index.html