cambios en form1
Merge branch 'master' of https://github.com/rogeliotoba/MariosScrum