completed hw4
Merge pull request #26 from salomanders/master

completed hw4