models and db.py modified
Merge branch 'master' of github.com:hobsonlane/pug