commit prj1
Merge branch 'master' of https://github.com/mchernichenko/test_project
commit prj1
fix conflict prj1