Fixed bugs in models.py
Merge branch 'master' of https://github.com/eswalker/cos333

Testing database