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

Conflicts:
	GameClient/ChurchPenetratedClientSkillEffect.cpp
	GameClient/STATISTICSlastgame.txt
	GameClient/ServerThread.cpp.orig
	GameClient/Skill.h
	GameClient/Skill.h.orig
fds
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt