uodate
Merge branch 'master' of github.com:ZJU-nyle-zq/MapAlarm

Conflicts:
	MapAlarm/ViewController.m