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

Conflicts:
	GameClient/DeferredRendering.fx
	GameClient/DeferredRendering.fx.orig
	GameClient/DeferredSampler.fx
	GameClient/DeferredSampler.fx.orig
	GameClient/GameClient.vcxproj.filters
	GameClient/GameState.cpp
	GameClient/GameState.cpp.orig