Novos recursos na interface, diagrama de classes, novo plan.
Merge branch 'master' of https://github.com/vitormota/AIAD_TP01

Conflicts:
	src/cityGarbageCollector/GCollector.java