changes made to run server and clients in different nodes
resolving conflicts.
Merge branch 'master' of https://github.com/vbeleuta/cpds_opty