agregar .settings y .metadata al gitignore
Merge branch 'master' of https://github.com/panimidi/Tarea6