working it out
Merge branch 'master' of https://github.com/matttelker/CS370