update
Merge branch 'master' of https://github.com/Casagrill/flask-blog