froze database for merge
Merge branch 'master' of github.com:CSLLC-Codeathon-2014/Door-Karma-Server

Conflicts:
	db.py