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

Conflicts:
	timer-o/src/main/java/core/TimerShell.java
	timer-o/src/main/java/core/Timero.java