changes to copy
sync

Conflicts:
	index.html