working from home
Merge origin/master

Conflicts:
	highscore/highscore.txt
final adjustments in school
final adjustments in school