Fixed merge mistake
Merge branch 'master' of https://github.com/Ajiperuyellow/pomodoro