first commit by Huiyu and add some comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/stringcalculator/StringCalculator.class