renamed:    bin/smiley/Agent.class -> bin/domini/Agent.class
	renamed:    bin/smiley/Cami.class -> bin/domini/Cami.class
	new file:   bin/domini/Ciutat.class
	renamed:    bin/smiley/ControlDades.class -> bin/domini/ControlDades.class
	renamed:    bin/smiley/ControlTram.class -> bin/domini/ControlTram.class
	renamed:    bin/graph/Edge.class -> bin/domini/Edge.class
	renamed:    bin/graph/Graph.class -> bin/domini/Graph.class
	new file:   bin/domini/Itinerari.class
	renamed:    bin/smiley/Main.class -> bin/domini/Main.class
	new file:   bin/domini/Mapa.class
	renamed:    bin/smiley/Reunio.class -> bin/domini/Reunio.class
	new file:   bin/domini/Tram.class
	renamed:    bin/graph/Vertex.class -> bin/domini/Vertex.class
	deleted:    bin/smiley/Ciutat.class
	deleted:    bin/smiley/Itinerari.class
	deleted:    bin/smiley/Mapa.class
	deleted:    bin/smiley/Tram.class
	renamed:    src/smiley/Agent.java -> src/domini/Agent.java
	renamed:    src/smiley/Cami.java -> src/domini/Cami.java
	renamed:    src/smiley/Ciutat.java -> src/domini/Ciutat.java
	renamed:    src/smiley/ControlDades.java -> src/domini/ControlDades.java
	renamed:    src/smiley/ControlTram.java -> src/domini/ControlTram.java
	renamed:    src/graph/Edge.java -> src/domini/Edge.java
	renamed:    src/graph/Graph.java -> src/domini/Graph.java
	renamed:    src/smiley/Itinerari.java -> src/domini/Itinerari.java
	renamed:    src/smiley/Main.java -> src/domini/Main.java
	renamed:    src/smiley/Mapa.java -> src/domini/Mapa.java
	renamed:    src/smiley/Reunio.java -> src/domini/Reunio.java
	renamed:    src/smiley/Tram.java -> src/domini/Tram.java
	renamed:    src/graph/Vertex.java -> src/domini/Vertex.java
	new file:   bin/dades/ControlDades.class
	new file:   src/dades/ControlDades.java
	deleted:    bin/domini/ControlDades.class
	deleted:    src/domini/ControlDades.java
Merge branch 'master' into dev
Merge branch 'master' of https://github.com/prop-smiley/ver1 into eric
	deleted:    bin/domini/ControlDades.class
	deleted:    src/domini/ControlDades.java
Merge branch 'master' of https://github.com/prop-smiley/ver1 into eric
guapo