task1
Merge branch 'master' of github.com:happysuslik/Task1_oop