Added timer capabilities
Merge branch 'master' of https://github.com/rit-sse-mycroft/app-trash30