conflict 2
Merge branch 'master' of github.com:KurlesHS/timer