2 add line file2
Merge branch 'master' of https://github.com/stoppegp/test1