asdasd

Conflicts:
	src/order/OrderPickerAgent.java
Revert 0246f25..1797b9e

This rolls back to commit 0246f25094f2a5149b1e3521f1db55665d0dd733.
OK SORRY FIXED NOW!
Merge branch 'develop' of https://github.com/MvanDiemen/agent_oriented_programming into develop

Conflicts:
	src/RunMe.java
	src/order/OrderPickerAgent.java