modified models.py
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc_data.db