resolved

Conflicts:
	index.html