123
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/maps/race/race.txt
	GameClient/maps/race/raceminimap.png