gitignore
Merge branch 'master' of github.com:pablosjv/practica2