2
2
3
3
4
6
7
10
updates to GUI
Merge branch 'master' of https://github.com/jmutabaz/distributedComputing

Conflicts:
	Proj 2 Team/Proj_2_Distributed_Computing/bin/.gitignore
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/RouterMessage.class
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/Server.class
	Proj 2 Team/Proj_2_Distributed_Computing/bin/Model/StartUp.class
	Proj 2
Team/Proj_2_Distributed_Computing/bin/application/ClientScreenController
.class
2
w
w
www