modified:   bin/domini/Reunio.class
	modified:   src/domini/ControladorReunio.java
	modified:   src/domini/Reunio.java
ghfsd
	modified:   bin/domini/Agent.class
	modified:   src/domini/Agent.java
	modified:   src/domini/ControladorCami.java
	modified:   src/domini/ControladorReunio.java
	modified:   src/domini/Itinerari.java
	modified:   src/domini/Mapa.java
adapt
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	bin/domini/Agent.class
	bin/domini/Ciutat.class
	bin/domini/Mapa.class
	bin/domini/Tram.class
	src/domini/ControladorReunio.java
	src/domini/Mapa.java
	src/domini/Tram.java
	.git/MERGE_HEAD