Added hour support
Merge branch 'master' of github.com:bettinson/Meditation-Timer