Homework 7
Merge pull request #9 from hoffm386/hw7

Homework 7