change file.2
Merge branch 'branch1' of https://github.com/lossas/test_git into branch2