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

Conflicts:
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/Client.class
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/Router.class
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/RouterThread.class
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/Server.class
	Proj 2
Team/Proj_2_Distributed_Computing/bin/application/ClientScreenController
.class