Don't know why this is this -paul
fast forward problem
Merge branch 'master' of https://github.com/jmutabaz/distributedComputing

Conflicts:
	Distributed_Part1/bin/.gitignore
	Distributed_Part1/bin/SThread.class
	Distributed_Part1/bin/TCPServer.class
	Distributed_Part1/bin/TCPServerRouter.class
	Distributed_Part1/src/Message.java
	Distributed_Part1/src/SThread.java
	Distributed_Part1/src/SocketClient.java
	Distributed_Part1/src/StartUp.java
	Distributed_Part1/src/TCPClient.java
	Distributed_Part1/src/TCPServer.java
	Distributed_Part1/src/TCPServerRouter.java