updates
Merge branch 'master' of https://github.com/AlexProv/ift605tp3

Conflicts:
	src/tp3_sys/AgentColoriant.java
	src/tp3_sys/ArbitreBehaviour.java