milestone tests pass
Merge branch 'master' of https://github.com/alfredababio/cs3600-project1