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

Conflicts:
	Java_Ex4/resources/Log/Server.log
Merge branch 'master' of https://github.com/rotem-ad/Java_Ex4.git