fixed high scores
merge conflict fix
fixed high scores bug
Merge pull request #7 from mcivorsteiner/refactored_controller

Refactored controller