updated settings
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning