listo para pruebas
completo
Merge branch 'master' of https://github.com/Fershark/javaPractica5
???