add 2 lines totest.html
one big commit
Merge branch 'test2'

Conflicts:
	test.html