Added highscores
Fixwed merge conflicts