task4-5
Merge pull request #4 from Margo-ogo/master

task4,task5