added support for local settings
Merge branch 'master' of https://github.com/ericartjohnson/school