initial working version
Merge commit '6569bf5790f5a95e31a0ccca296abc68dc3ec374' into develop

Conflicts:
	src/timer3/Gui.java
	test/timer3/ModelTest.java
updated README