userB create and write userA-file2.txt
Merge branch 'master' of https://github.com/aclove/TestProject

Conflicts:
	userA-file2.txt
userB create userB-file3.txt
Merge branch 'master' of https://github.com/aclove/TestProject