inter dia updated
Merge branch 'master' of https://github.com/oleander/multi-agent-programming
removed merge symbol