Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/hrm8/FoodFlow

Conflicts:

FoodFlow/FoodFlow.xcodeproj/project.xcworkspace/xcuserdata/henriquemorae
s.xcuserdatad/UserInterfaceState.xcuserstate
	FoodFlow/FoodFlow/Chat/ChatViewController.m