changes in new via master branch
commit from my own
commit from master
another commit from my_own branch
using theirs
Merge pull request #3 from abaginska/my_own

commit from my own
commit my_own
commit master
Merge pull request #4 from abaginska/my_own

commit my_own
ours new (master)