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

Conflicts:
	Proj 2
Team/Proj_2_Distributed_Computing/application/ServerScreenController.jav
a