test
Merge remote-tracking branch 'origin/loader'

Conflicts:
	server/score.c
	resolved