Conflict
Merge branch 'master' of https://github.com/djiworks/NetLogo_Multi-agent-system

Conflicts:
	labyrinth.nlogo