update
Merge branch 'master' of git@github.com:fengzishiren/SmartTips.git

Conflicts:
	src/Client.java