Update README.md
Merge branch 'develop'
Added functionality to edit timer