minor improvements
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
cooldown för skills, shader resource från depth stencil
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/GameState.cpp