init
-n 
update testB
update
Merge commit '52492e468033660a39020b070ed67701feeb4a86'

Conflicts:
	TestSubtreeB/src/com/testb/MainBObject.java