working from home
Merge origin/master

Conflicts:
	highscore/highscore.txt
working from home