Merge pull request #1 from engitechnic/master

agregando partes de los demas
Merge pull request #4 from shiminasai/master

Merge pull request #1 from engitechnic/master