Details
Merge branch 'master' of https://github.com/SoreGus/DesafioMapa

Conflicts:

iFastFood.xcodeproj/project.xcworkspace/xcuserdata/Lucas.xcuserdatad/Use
rInterfaceState.xcuserstate
	iFastFood/Base.lproj/Main.storyboard