ignore
file 2 master
Merge branch 'master' of https://github.com/iavor78/GitTest_1