fixed bugs
database and test cases added
Merge branch 'master' of https://github.com/larissa88/EatSmart

Conflicts:
	server/__main__.py