Revert "Revert b0b0a64..b1a3e52"

Conflicts:
	index.html