IceChen's merge
Merge branch 'master' of https://github.com/sunbo0123/caitu

Conflicts:
	test.txt