Adding reset when game is finished
Merge remote-tracking branch 'origin/master'