buncha stuff
Merge branch 'hw1-nwolfe' of ssh://git@github.com/nikwolfe7/hw1-nwolfe.git into hw1-nwolfe