update
update
Removed the stupid strange file that shouldn't be tracked
update
Removed the stupid strange file that shouldn't be tracked
update
update
update
update
Merge branch 'nyle'

Conflicts:
	MapAlarm.xcodeproj/project.xcworkspace/xcuserdata/dengyonghui.xcuserdatad/UserInterfaceState.xcuserstate
update
Merge branch 'master' of github.com:ZJU-nyle-zq/MapAlarm

Conflicts:
	MapAlarm.xcodeproj/project.pbxproj
	MapAlarm.xcodeproj/project.xcworkspace/xcuserdata/dengyonghui.xcuserdatad/UserInterfaceState.xcuserstate
	MapAlarm/Util/Util.h
	MapAlarm/ViewController.m
	MapAlarm/bus_no_sign.png