cleanup
Merge branch 'master' into text-update

Conflicts:
	index.html