wrong location
wrong location
Merge branch 'master' of https://github.com/nico78/timer-o.git

Conflicts:
	README.md