Merge https://github.com/NickMele/timer

Conflicts:
.gitignore
Merge branch 'master' of https://github.com/NickMele/timer