Commit 1 issue54
Commit 2 issue54
Commit 3 issue54
Resuelvo conflictos ramas issue54 y origin/master