timer finished
Merge branch 'master' of github.com:zen6/AudioBike

Conflicts:
	src/MJWTest2.java