server and ios
Merge branch 'master' of https://github.com/larissa88/EatSmart