Added highscores
Fixed merge conflict