dd
Merge branch 'master' of https://github.com/larissa88/EatSmart

Conflicts:
	iOS/EatSmart/DataBaseConnection.m
	server/__main__.py