modify 2,3
Merge branch 'master' of https://github.com/wmssystem/shima-test

Conflicts:
	test.txt