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

Conflicts:
	.gitignore
	Proj 2
Team/Proj_2_Distributed_Computing/application/ClientScreenController.jav
a
	Proj 2
Team/Proj_2_Distributed_Computing/bin/application/ClientScreenController
.class
d