代码规范
Merge branch 'master' of github.com:ijaychen/timer