timer fixed, game collision and jump reset
Merge remote-tracking branch 'origin/master'