Corrected the merge unsuccessfull
Added a line to call tests
Add forgotten to increment the clock after sending
Add some test for the serviceThread
Remove participant that we did not use in class
Changed a bit the protocol because {{ is forbidden in a split