new line file2
Merge branch 'branch2' of https://github.com/lossas/test_git into branch2