Merge pull request #8 from MarioASM/master

integrando desarroll2 a desarrollo
Merge pull request #9 from MarioASM/desarrollo

Merge pull request #8 from MarioASM/master