user1 modify 2
Merge branch 'master' of https://github.com/shilinggang/omotasTest

Conflicts:
	test.txt