Merge branch 'josep' of https://github.com/carlosep93/PROP_CAMIONS into pol
capa_presentació
Merge branch 'pol'