add a txt 2.txt
Merge branch 'master' of https://github.com/bigsmiles/learnGit
Merge branch 'master' of https://github.com/bigsmiles/learnGit
hehe
no confilcts