GIBEERISH
Merge branch 'master' of https://github.com/JoeWise/Divvy

Conflicts:
	models/db.py
Merge branch 'master' of https://github.com/JoeWise/Divvy

Conflicts:
	models/db.py