important settings
fixed
Merge branch 'master' of https://github.com/colehudson/flaskApp
Merge branch 'master' of https://github.com/colehudson/flaskApp
Merge branch 'master' of https://github.com/colehudson/flaskApp
config changes
other settings file