yotam: nothing important really. started to do some models
Merge remote-tracking branch 'origin/master'
yotam: Created Models
Merge branch 'master' of https://github.com/almondg/cursejar

Conflicts:
	cursejar/cursejar/settings/local.py
	requirements.txt