add file 4.text in 1
Merge branch 'master' of https://github.com/cheneylew/testGit