Merge pull request #8 from MarioASM/master

integrando desarroll2 a desarrollo