compressed
Merge branch 'master' into gh-pages

Conflicts:
	src/html/index.html