nonconflicting 1
conflicting 1
nonconflicting 2
conflicting 2
Merge pull request #4 from eduardog3000/a

Merge second conflicting branch into mediator.