Merge branch 'master' of https://github.com/seashore115/hci

Conflicts:
food－square.xcodeproj/project.pbxproj

food－square.xcodeproj/project.xcworkspace/xcuserdata/Apple.xcuserdatad/U
serInterfaceState.xcuserstate
food－square/MainViewController.m
food－square/MapItemAnnotation.h
food－square/MapItemAnnotation.m
food－square/MapViewController.h
food－square/MapViewController.m
Merge branch 'master' of https://github.com/seashore115/hci

Conflicts:
	food－square.xcodeproj/project.pbxproj

food－square.xcodeproj/project.xcworkspace/xcuserdata/Apple.xcuserdatad/U
serInterfaceState.xcuserstate
	food－square/MainViewController.m
	food－square/MapItemAnnotation.h
	food－square/MapItemAnnotation.m
	food－square/MapViewController.h
	food－square/MapViewController.m