shelf changes (ClassB2)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sample/ClassB2.java