spelaringenroll
asdas
dfsdfs
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	.gitignore.orig
	GameClient/GameState.cpp
sends the clients the maps
dsa
fsdfds
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/GameClient.vcxproj.filters
	GameClient/GameState.cpp
	GameClient/LobbyState.h
	GameClient/MapHandler.cpp
	GameClient/STATISTICSlastgame.txt
	GameClient/Server.h
	GameClient/ServerThread.cpp
	GameClient/client.cpp
	GameClient/client.h
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt