Commit local
Merge remote-tracking branch 'origin/master'

Fusion de commit local con remoto