function test in B (Master)
Merge remote-tracking branch 'origin/master' into modClassA

Conflicts:
	module1/src/B.java