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

Conflicts:
	GameClient/GameClient.vcxproj
	GameClient/client.cpp.orig
	GameClient/client.h.orig
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt