model
Merge branch 'master' of https://github.com/tjmaas/cs373-idb

Conflicts:
	Twistory/myapp/models.py