notemueras
reunio
Merge branch 'dev' of https://github.com/prop-smiley/ver1 into dev

Conflicts:
	bin/.gitignore
	bin/domini/Reunio.class
	src/domini/Reunio.java

 	modified:   README.md
	modified:   bin/.gitignore
	modified:   bin/dades/ControlDades.class
	modified:   bin/domini/Agent.class
	modified:   bin/domini/Cami.class
	modified:   bin/domini/Ciutat.class
	new file:   bin/domini/ControlAgent.class
	new file:   bin/domini/ControlTram.class
	new file:   bin/domini/Edge.class
	new file:   bin/domini/Graph.class
	modified:   bin/domini/Itinerari.class
	modified:   bin/domini/Mapa.class
	modified:   bin/domini/Reunio.class
	modified:   bin/domini/Tram.class
	new file:   bin/domini/Vertex.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/ControladorAgent.java
	modified:   src/domini/ControladorTram.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
	new file:   src/domini/Edge.java
	new file:   src/domini/Graph.java
	modified:   src/domini/Mapa.java
	modified:   src/domini/Reunio.java
	modified:   src/domini/Tram.java
	new file:   src/domini/Vertex.java