Merge pull request #1 from CarlosLopezP/master

copy and paste
chat 25%
cambios
Delete .gitignore
gitignore
Merge pull request #1 from pabloPM/master

milando