axzxc
Merge remote-tracking branch 'origin/master'

Conflicts:
	SalesTool/bin/com/git/hub/example/ClassA.class