cleanup
Merge pull request #114 from KelseyLMay/branchfinal

cleanup