Reimplemented timer.
Lock the game so it wont get started while displaing scores.
Merge conflicts.