test
Merge branch 'Me' of https://github.com/essob/Client1 into Me

Conflicts:
	ClientConnection.java
	ClientController.java
	ClientGUI.java
	Response.java
deleted request
stavfel
Merge branch 'Tobias'

Conflicts:
	PlayLabel.java
Merge branch 'master' into Me

Conflicts:
	ClientConnection.java
	ClientController.java
småtjafs som krånglar
Gui-pyssel
Rita ut korten på spelplanen
Merge branch 'Me'
Merge branch 'master' into Tobias

Conflicts:
	ClientGUI.java