.gitignore agregado
intento de merge
Merge branch 'master' of https://github.com/pradoAgustin/adetp

merging