Finished homework4
Merge pull request #55 from luxury1/master

Finished homework4