mediator dia
.
Merge branch 'master' of https://github.com/oleander/multi-agent-programming

Conflicts:
	assignment-1/prometheus.md