user 1 for conflict test
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	src/pack/Testing.java