those error messages, doe
Merge branch 'master' of github.com:stuycs-softdev/proj1-7
Merge branch 'master' of github.com:stuycs-softdev/proj1-7