added file 4
fix in 2.txt
chenged file 3.txt
Merge branch 'branch1'
Merge branch 'branch2'
Merge branch 'branch3'