Merge branch 'master' into Emily
Merge branch 'master' into Emily
Merge branch 'master' into Emily
Merge branch 'masterPerfect' into Emily
småfix i rules
Merge branch 'master' into Emily
Jobbar med kort i listor

Behöver fixa så att klienten får rätt data
fix och trix och många if i rules
Merge branch 'Tobias' into Emily
Merge branch 'Emily' into Tobias
japp
Merge branch 'Anna' into Tobias

Conflicts:
	DataBase.java
Merge branch 'master' into Tobias

Conflicts:
	Controller.java
	DataBase.java
	Request.java
	Response.java
	Server.java
Fixat så kort försvinner i från spelarhanden.
Merge branch 'Tobias'