changed ClassA
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sample/ClassA.java
New ClassB2
new method
reformat
reformat
t
Merge remote-tracking branch 'origin/master'