statistics, fixing joining/dissconecting
sdas
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/GameClient.vcxproj.filters
	GameClient/Server.cpp
	GameClient/Skill.h
netwoirrkri chencies
dasd
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	.gitignore.orig