Тask1, 1.7 commit
Merge remote-tracking branch 'origin/master'