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 remote-tracking branch 'origin/masterPerfect' into Anna
Database update
Merge branch 'Emily' into Tobias
japp
Merge branch 'Anna' into Tobias

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

Conflicts:
	Server.java
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
synkproblem
d