Merge collectorBDI
Merge branch 'vitor_branch' of https://github.com/vitormota/AIAD_TP01

Conflicts:
	src/cityGarbageCollector/agent/CollectorBDI.java