hw 6
Merge pull request #7 from massiek/hw6

Merge hw6