pruebas
Merge branch 'magnus' of https://github.com/loxosceles/bases_de_datos into magnus