fffffff
Merge remote branch 'origin/master'

Conflicts:
	SalesTool/src/com/git/hub/example/ClassA.java