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

Conflicts:
	GameClient/output.txt
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
yjyjuy
trrttrrtrt
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Ai Done!
rtgtgf
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/output.txt
	GraphicsEngine/DeferredRenderingEffectFile.cpp
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
tyyttyg
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/Enemy.cpp.orig
	GameClient/GameState.cpp.orig
	GameClient/Hero.cpp.orig
	GameClient/MapHandler.cpp
	GraphicsEngine/DeferredRenderingEffectFile.cpp
	GraphicsEngine/DeferredRenderingEffectFile.cpp.orig
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Fixat fienderna och en boss-klass. Bossen är inte klar och kommer, i nuläget, inte användas.
dsdsdsds
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj.filters