2
Merge branch 'master' of
https://github.com/DistributedAlgorithm/Project.git

Conflicts:
	DistributedAlgorithm/src/com/ds/client/communication/Client.java