CardLayout added to server
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/GameServer.class
	bin/ServerReader.class