pepe
Merge branch 'rpcolom'
Merge branch 'master' of https://github.com/cnpallares/repositori-prova