Merge branch 'master' of https://github.com/huxiaoqiao/TomatoClock

Conflicts:

TomatoClock.xcodeproj/project.xcworkspace/xcuserdata/huxiaoqiao.xcuserda
tad/UserInterfaceState.xcuserstate
123
Merge remote-tracking branch 'origin/master'
123