changes Server
Merge branch 'master' of
https://github.com/Inf-122-Team-3/finalprojectteam3.git

Conflicts:
	FinalAssignment/src/ServerClient/Server.java