homework5
Merge pull request #30 from ssz225/master

homework5