Modificado por desarrollador A
Cambios Rama B
Merge branch 'RamaB' of https://github.com/Tamakiwan/P5
Merge branch 'ramaA' of https://github.com/Tamakiwan/P5