hej he

hehhej
Merge remote-tracking branch 'origin/master' into Anna
Merge remote-tracking branch 'origin/master' into Anna
lagt till DB-connection
Merge remote-tracking branch 'origin/master' into Anna
Merge remote-tracking branch 'origin/master' into Anna
Merge remote-tracking branch 'origin/master' into Anna
test i databas
Merge branch 'master' into Emily
Merge branch 'master' into Emily
bad things
Merge branch 'master' into Emily
Merge branch 'master' of https://github.com/Elmseld/sjuan

Conflicts:
	Response.java
	Server.java
Merge remote-tracking branch 'origin/masterPerfect' into Anna
Merge branch 'masterPerfect' into Emily
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'
småfix i rules