changed
Merge branch 'new_thing'

Conflicts:
	test.html