if any team member has the sudden urge to contribute, try completing one of the tasks in TODO
Merge branch 'master' of github.com:stuycs-softdev/proj1-7