B: testB
merge A and B
extra char B
Merge remote-tracking branch 'origin/modClassB'
Merge remote-tracking branch 'origin/modClassA'
Erased whitespaces
Merge branch 'modClassA'

Conflicts:
	module1/src/B.java
master annoys A
float floatB