1
2
2
Merge branch 'branch1'

Conflicts:
	GitTest/src/HelloWorld.java