merda
la classe ciutat
Merge branch 'josep'
Merge branch 'carlos'
merda
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
addElement