branch5
testbranch3
Merge branch 'testBranch5'

Conflicts:
	src/TestClass.java