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

Conflicts:
	Controller.java
	DataBase.java
	Request.java
	Response.java
	Server.java