deleted duplicated methods in db
obetydliga förändringar
dd
Merge remote-tracking branch 'origin/master' into Anna
LogIn connection
Merge branch 'Tobias'
LogIn connection
mergar in master i Anna
changes do to structurechanges
Merge branch 'master' into Tobias

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