1) Chouzhi
Merge branch 'master' of https://github.com/LucasHuangGZ0802/xmwatchclock

Conflicts:
	xmwatchclock/XiaoMingClock/mainStoryBoard.storyboard