Merging at school
Added working highscore and some new graphics, minor changes and some QA input.