Working broker and possibly working client
Merge pull request #79 from katharosada/mercimaster

Working broker and possibly working client