modified dev.txt ---bck
modified test.txt add some information
modified test.txt on master branch
Merge branch 'feature1'