commtiting from branch 1
change done by second user
commit to by user2
User 1 committing
user 1 for conflict test
user 2 for conflict test
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	src/pack/Testing.java
Merge branch 'master' into branch2

Conflicts:
	src/pack/Testing.java