resolucion conflictos
ssss
Merge pull request #4 from jpcardona/Pablo

Pablo