Merge pull request #5 from mcivorsteiner/refactored_controller

Refactored controller
fixed broken Game Over screen
Merge pull request #6 from mcivorsteiner/view_branch

fixed broken Game Over screen
fixed high scores
merge conflict fix
fixed high scores bug