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

Conflicts:
	GameClient/Enemy.cpp
	GameClient/FrostTurret.cpp
	GameClient/GameClient.vcxproj.filters
	GameClient/STATISTICSlastgame.txt
	GameClient/Server.h
minor improvements
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj
	GameClient/STATISTICSlastgame.txt
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj.filters
	GameClient/Server.h