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

commit from my own