updates
Merge branch 'master' of https://github.com/HellerCommaA/flask-boilerplate