Delete .gitignore
gitignore
Merge branch 'master' into Carlos
Arreglo plantilla generica #36
Merge pull request #53 from osl-students-developers/Carlos

arreglo plantilla