added high score functionality
merging
fixed merge conflict