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

Conflicts:
	GameClient/STATISTICSlastgame.txt
	GameClient/STATISTICSlastgame.txt.orig
kanske fixade lite problem
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/Enemy.cpp
	GameClient/STATISTICSlastgame.txt
	GameClient/output.txt
fixade skuggor