hw7
Merge pull request #7 from beckhamer/hw7

hw7