new file:   bin/.gitignore
	modified:   bin/domini/ControlAgent.class
	deleted:    bin/domini/Edge.class
	deleted:    bin/domini/Graph.class
	modified:   bin/domini/Mapa.class
	modified:   bin/domini/Tram.class
	new file:   src/base/BaseEdge.java
	new file:   src/base/BaseGraph.java
	new file:   src/base/BaseVertex.java
	deleted:    src/domini/Edge.java
	deleted:    src/domini/Graph.java
	modified:   src/domini/Mapa.java
	modified:   src/domini/Tram.java
	new file:   src/weighted/WeightedEdge.java
	new file:   src/weighted/WeightedGraph.java
	deleted:    bin/.gitignore
	new file:   bin/base/BaseEdge.class
	new file:   bin/base/BaseGraph.class
	new file:   bin/base/BaseVertex.class
	modified:   bin/domini/Agent.class
	modified:   bin/domini/Cami.class
	modified:   bin/domini/Ciutat.class
	deleted:    bin/domini/ControlDades.class
	modified:   bin/domini/Tram.class
	deleted:    bin/domini/Vertex.class
	new file:   bin/weighted/WeightedEdge.class
	new file:   bin/weighted/WeightedGraph.class
	modified:   src/base/BaseVertex.java
	modified:   src/domini/Agent.java
	modified:   src/domini/Cami.java
	modified:   src/domini/Ciutat.java
	modified:   src/domini/Reunio.java
	modified:   src/domini/Tram.java
	deleted:    src/domini/Vertex.java
	modified:   src/weighted/WeightedEdge.java
adapt
holaholita
Merge branch 'master' of https://github.com/prop-smiley/ver1 into dev

Conflicts:
	bin/.gitignore
	bin/domini/Agent.class
	bin/domini/Cami.class
	bin/domini/Ciutat.class
	bin/domini/ControlAgent.class
	bin/domini/ControlTram.class
	bin/domini/Edge.class
	bin/domini/Graph.class
	bin/domini/Mapa.class
	bin/domini/Reunio.class
	bin/domini/Tram.class
	bin/domini/Vertex.class
	src/domini/Agent.java
	src/domini/Cami.java
	src/domini/Ciutat.java
	src/domini/ControladorAgent.java
	src/domini/ControladorTram.java
	src/domini/Edge.java
	src/domini/Graph.java
	src/domini/Mapa.java
	src/domini/Reunio.java
	src/domini/Tram.java
	src/domini/Vertex.java