Use fancier words to make the point more clearly
Merge branch 'edit-2'

Conflicts:
	index.html