updating settings
Merge branch 'master' of https://github.com/bcurran07/ngo-360