commit 2
commit 3
Merge branch 'branch1'

Conflicts:
	httpTest.txt