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

Conflicts:
	GameClient/ClientHandler.cpp
	GameClient/DeferredSampler.fx
	GameClient/GameState.cpp
	GameClient/ModelIdHolder.cpp
	GameClient/maps/race/race.txt
	GameClient/maps/race/racebmp1.png
	GameClient/maps/race/racebmp2.png
	GameClient/maps/race/raceminimap.png
	GraphicsEngine/DeferredSamplerEffectFile.cpp
	GraphicsEngine/DeferredSamplerEffectFile.h
	GraphicsEngine/World.cpp