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