modify user1.txt by user1
Merge branch 'master' of https://github.com/xucaixia/test1
modify user1.txt by user1