hw7 changes and additions
Merge pull request #6 from ConnorAvery/hw7

hw7 changes and additions