bad things
Merge branch 'master' of https://github.com/Elmseld/sjuan

Conflicts:
	Response.java
	Server.java
Jobbat med flytta kort mellan listor

ClientID skickas med till server

utökat metoder i rules

skapat konstruktör i response

skapat konstruktör i request

tagit bort onödig metod i player

lagt till villkor i controllerklass
Merge branch 'masterPerfect' into Tobias
Merge branch 'masterPerfect'
Merge branch 'Tobias'
Merge branch 'master' into Anna

Conflicts:
	DataBase.java
	Server.java
Merge branch 'Anna' of https://github.com/Elmseld/sjuan into Anna

Conflicts:
	DataBase.java
	Server.java