edited text
Merge branch 'branch2' of github.com:medfoo/TestProject into branch3
edited text
Merge branch 'branch2' into branch3