Merge branch 'master' of https://github.com/Katerpilet/food-finder

Conflicts:
	engineering/FoodFinderApp/FoodFinderApp.xcodeproj/project.pbxproj

engineering/FoodFinderApp/FoodFinderApp.xcodeproj/project.xcworkspace/xc
userdata/student.xcuserdatad/UserInterfaceState.xcuserstate

engineering/FoodFinderApp/FoodFinderApp.xcodeproj/xcuserdata/student.xcu
serdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	engineering/FoodFinderApp/FoodFinderApp/FoodDatabaseConnector.h
Merge branch 'master' of https://github.com/Katerpilet/food-finder

Conflicts:
	engineering/FoodFinderApp/FoodFinderApp/FoodDatabaseConnector.h
	engineering/FoodFinderApp/FoodFinderApp/FoodDatabaseConnector.m
	engineering/FoodFinderApp/FoodFinderApp/Restaurant.m
	engineering/FoodFinderApp/FoodFinderApp/Restauraunt.h