fixed merge conflict
fixed merge conflict
Merge branch 'master' of https://github.com/stuycs-softdev/proj1-7