Added method to stop timer when you quit the game
Merge remote-tracking branch 'origin/Alpha' into Alpha