add two line in file2.txt
add 3 line in file2.txt
add 4 line in file2.txt
Merge branch 'branch1' of github.com:panqijun2006/test
add 3 linw in file1