köpa skills
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameState.cpp
	GameClient/maps/race/race.txt
	GameClient/maps/race/racebmp1.png
	GameClient/maps/race/racebmp2.png
	GameClient/maps/race/raceminimap.png
	GameClient/textures/5.png
	GameClient/textures/6.png
	GameClient/textures/7.png
	GameClient/textures/8.png