completed assignement
Merge pull request #51 from tsmith37/master

Thomas Smith