test add to branch nr 2
committed test changes
branch 3 test add
edit on branch 3
master test file initial add
edit 1 on master
edit 2 on master
Merge branch 'branch2' into branch1
Merge branch 'branch3' into branch1
Merge branch 'master' into branch1