1
2
Merge branch 'issue2'
Merge branch 'issue3'

Conflicts:
	test.html