changes
Merge branch 'master' of https://github.com/rotem-ad/Java_Ex4.git

Conflicts:
	Java_Ex4/src/model/Server.java