A annoys B
Merge branch 'modClassA'

Conflicts:
	module1/src/B.java