Fix horrible format
Merge branch 'my-branch'

Conflicts:
	index.html