This look good to merge
Merge branch 'collision'

Conflicts:
	index.html