modified:   README.md
	new file:   bin/domini/ControlAgent.class
	new file:   src/domini/ControlAgent.java
Merge branch 'master' of https://github.com/prop-smiley/ver1 into dev
	modified:   bin/domini/ControlAgent.class
	modified:   src/domini/ControlAgent.java
Merge branch 'master' of https://github.com/prop-smiley/ver1 into eric
Merge branch 'master' of https://github.com/prop-smiley/ver1 into dev
Merge branch 'master' of https://github.com/prop-smiley/ver1 into eric
	modified:   bin/domini/ControlAgent.class
	modified:   bin/domini/Edge.class
	modified:   src/domini/ControlAgent.java
	new file:   ../bin/domini/ControlDades.class
	modified:   domini/ControlAgent.java
	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
Merge branch 'master' of https://github.com/prop-smiley/ver1 into eric