test
Merge branch 'Emily' of https://github.com/Elmseld/sjuan into Emily

Conflicts:
	Controller.java
	Response.java
	Server.java
tog bort humanklass