q
a
Merge branch 'josep'
 a la merda relation
2
Merge branch 'pol'
solution
tour sense errors fotat pol!!!