closes #8
closes
closes#9
Merge pull request #34 from KelseyLMay/branch8/9

Branch8/9