not working
Merge branch 'iss1' of https://github.com/johnfoley3/CS430