Cleaned up a little
Merge branch 'master' of https://github.com/cs3600/project2
Merge branch 'master' of https://github.com/cs3600/project2