commit master
commit master
Merge branch 'Segona_branca'
Merge branch 'master' into Segona_branca