edited file4 in branch2
Merge branch 'master' into branch2