working code
Merge pull request #2 from esimmo17/testing

merge master with testing code
Merge pull request #3 from esimmo17/master

Master