git ignore
Merge branch 'master' of github.com:danielcasanovas/Practica1