fixes

Conflicts:
	index.html