Added the 'add' action button
conflict resolve
Merge branch 'master' of github.com:napon/VibrateTimer