Clint

minor changes
Merge branch 'master' of https://github.com/jmutabaz/distributedComputing

Conflicts:
	Jave FX Client/src/application/clientWindow.fxml