nonconflicting 1
conflicting 1
nonconflicting 2
conflicting 2
Merge pull request #2 from eduardog3000/master

Merge first conflicting branch into mediator.