лабораторна 6
Merge branch 'innka'
Merge branch 'master'