hw 7
Merge pull request #8 from massiek/hw7

hw 7