started working on the edit screen UI
Merge branch 'master' of https://github.com/napon/VibrateTimer
Merge branch 'master' of https://github.com/napon/VibrateTimer