add 1 in 2.txt
Merge branch 'master' of github.com:liu13chao/gitdemo