Game over and timer fix

timer was refusing to die. it dies now.
Merge branch 'master' of https://github.com/Psiryu/4000War