removed some files
Fixing merge conflicts

Conflicts:
	text/highscore.txt