bad things
Merge branch 'master' of https://github.com/Elmseld/sjuan

Conflicts:
	Response.java
	Server.java