merda mc
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
reestructurat el codi
cuadrados y lineas
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into pol

Conflicts:
	Capa_Presentació/nbproject/build-impl.xml
	Capa_Presentació/nbproject/genfiles.properties
city
Merge branch 'joan' of https://github.com/carlosep93/PROP_CAMIONS into joan
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into pol
més restructuració...
Merge branch 'josep'
tot
Merge branch 'joan'
aqui nomes currem 2! xD
adeu ciutat :D
una mica mes reordenat
 hears
-Ciutat
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
City amb punts i no elements
Merge branch 'joan'