fixed bugs
Merge branch 'master' of github.com:zhangela/desk-trainer
Merge branch 'master' of github.com:zhangela/desk-trainer