Merge pull request #1 from omsanchez/master

Pull for testing
carga inicial de codigo
Merge pull request #2 from jorgerdc/master

cambios-jorge
code breaker code