change from local
Merge branch 'branchA' of https://github.com/beniq/gittest.git into
branchA

Conflicts:
	src/test/TestB.java