Test merge
Merge branch 'master' of https://github.com/norjekudo/pomodoro

Conflicts:
	README.md