Primer commit
Segundo commit, se hará un --no-ff
Merge branch 'feature/cambio-con-dos-commits-no-ff' into develop