got info to display for restaurant view controller
commit before trying to merge again
gitignore
Merge branch 'master' of https://github.com/christophergu/Foodys into matt

Conflicts:
	Foodys.xcodeproj/project.pbxproj
	Foodys/Storyboard.storyboard