modified:   src/domini/Agent.java
dd
Merge branch 'master' of https://github.com/prop-smiley/ver1 into carlos
Merge branch 'dev' of https://github.com/prop-smiley/ver1 into carlos
Merge branch 'carlos' of https://github.com/prop-smiley/ver1 into carlos
	modified:   README.md
	modified:   bin/domini/ControlAgent.class
	deleted:    bin/domini/ControlDades.class
	modified:   bin/domini/Edge.class
	modified:   src/dades/ControlDades.java
	modified:   src/domini/Agent.java
	new file:   src/domini/Algorithm.java
	modified:   src/domini/Cami.java
	modified:   src/domini/Ciutat.java
	modified:   src/domini/ControlAgent.java
	modified:   src/domini/ControlTram.java
	new file:   src/domini/DriverAgent.java
	new file:   src/domini/DriverCami.java
	new file:   src/domini/DriverCiutat.java
	new file:   src/domini/DriverReunio.java
	new file:   src/domini/DriverTram.java
	modified:   src/domini/Edge.java
	modified:   src/domini/Graph.java
	modified:   src/domini/Mapa.java
	modified:   src/domini/Reunio.java
	modified:   src/domini/Tram.java
	modified:   src/domini/Vertex.java
	modified:   src/domini/Agent.java
	modified:   src/domini/Algorithm.java
	modified:   src/domini/Agent.java
Update Agent.java
	modified:   src/domini/ControlAgent.java