test merge
Merge branch 'master' of https://github.com/zhangmeteor/AlarmClock
Label need change