settings updated for deployment
Merge branch 'master' of https://github.com/joeyuan19/flaming-bear