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

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

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

Conflicts:
	.gitignore
	GameClient/GameState.cpp
	GameClient/GameState.h
	GameClient/STATISTICSlastgame.txt
	GameClient/output.txt
	GraphicsEngine/DeferredRenderingEffectFile.cpp
lol