first commit working on maps now
Merge branch 'master' of https://github.com/cnorthup/LazyPizzaJoint

Conflicts:
	LazyPizzaFinder.xcodeproj/project.pbxproj
	LazyPizzaFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	LazyPizzaFinder.xcodeproj/project.xcworkspace/xcuserdata/marionano.xcuserdatad/UserInterfaceState.xcuserstate
	LazyPizzaFinder.xcodeproj/xcuserdata/marionano.xcuserdatad/xcschemes/LazyPizzaFinder.xcscheme
	LazyPizzaFinder.xcodeproj/xcuserdata/marionano.xcuserdatad/xcschemes/xcschememanagement.plist
	LazyPizzaFinder/AppDelegate.h
	LazyPizzaFinder/AppDelegate.m
	LazyPizzaFinder/Base.lproj/Main.storyboard
	LazyPizzaFinder/Images.xcassets/AppIcon.appiconset/Contents.json
	LazyPizzaFinder/Images.xcassets/LaunchImage.launchimage/Contents.json
	LazyPizzaFinder/LazyPizzaFinder-Info.plist
	LazyPizzaFinder/LazyPizzaFinder-Prefix.pch
	LazyPizzaFinder/ViewController.h
	LazyPizzaFinder/ViewController.m
	LazyPizzaFinder/en.lproj/InfoPlist.strings
	LazyPizzaFinder/main.m
	LazyPizzaFinderTests/LazyPizzaFinderTests-Info.plist
	LazyPizzaFinderTests/LazyPizzaFinderTests.m
	LazyPizzaFinderTests/en.lproj/InfoPlist.strings