Fix conflicts
Merge branch 'master' of https://github.com/juanitodread/Libreria-Alejandria.git
Fix conflicts