skuggor som inte fungerar
lol2
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/GameState.cpp
shadow mapping
lol
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/ClientSkillEffects.h
	GameClient/GameClient.vcxproj.filters
	GameClient/GameState.cpp
	GameClient/GameState.cpp.orig