iuguigigu
ready color of button
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/NetworkMessage.h
	GameClient/Server.h
	GameClient/client.cpp
	GameClient/client.h