solucion fallos
Merge branch 'master' of https://github.com/Neklussy/Practica3LBNJ.git