reset

Conflicts:
	index.html
a