troll nothing
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Animation working without blend
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/DeferredSampler.fx
	GameClient/maps/levelone/levelone.txt