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

Conflicts:
	.gitignore.orig
	GameClient/DeferredSampler.fx
	GameClient/GlowRendering.fx