db changes
Merge branch 'search' of https://github.com/alokedesai/Database-Setup into search

Conflicts:
	app.db
	app.pyc