10oct mod
Merge branch 'newMaster' of https://github.com/Franx0/ProyectoLibro into newMaster
10oct mod