second commit
last version
Merge branch 'master' of https://github.com/alejo1889/Practica3