edited db
Merge branch 'master' of https://github.com/cyntzhou/final

Conflicts:
	db.pyc
edited
Merge branch 'master' of https://github.com/cyntzhou/final

Conflicts:
	db.pyc