fix3
fix3
Merge branch 'new' of https://github.com/ozhuk/study-project into new