added the timerfix, as requested by jehan
Merge branch 'MultipleMarkers' of https://github.com/MaartenvE/game1 into MultipleMarkers