bara en bortkommentering
Merge branch 'master' into Me
Börjat utöka kommunikation mellan klient och server

och lite annat klydd
skapat playlabel
Merge branch 'Tobias'
Merge branch 'master' into Perfect-master
La till if-sats i getStartConditions
tog bort och la till
Lade till KlientID
Merge branch 'Me'
Merge branch 'Tobias' into Perfect-master
Merge branch 'Tobias'
test
Merge branch 'Me' of https://github.com/essob/Client1 into Me

Conflicts:
	ClientConnection.java
	ClientController.java
	ClientGUI.java
	Response.java
deleted request
Merge branch 'master' of https://github.com/essob/Client1
Merge branch 'master' into Tobias
stavfel
tanke kring kortvisning i panel
Merge branch 'Tobias'

Conflicts:
	PlayLabel.java