user2
Merge branch 'master' of https://github.com/chinsong2/GitTest

Conflicts:
	multitest.txt
user2 resolve