modify Server.java
Merge branch 'master' of https://github.com/gederickson/praktikumSister1

Conflicts:
	Server/src/server/Server.java