changes
resolve confl

Conflicts:
	index.html