updating homework
Merge remote-tracking branch 'upstream/master'
Lessopn 7 completed