Primer commit
Merge branch 'master' of https://github.com/autentia/tomodoro

Conflicts:
	.gitignore