closing
Merge branch 'master' of https://github.com/phouse512/eecs340-proj2

working to fix close merge bugs