update:wq
finish interface of main activity
Removed the stupid strange file that shouldn't be tracked
update
update
Merge branch 'nyle'

Conflicts:
	MapAlarm.xcodeproj/project.xcworkspace/xcuserdata/dengyonghui.xcuserdatad/UserInterfaceState.xcuserstate