commit ana
Merge pull request #1 from fgodino/ana

commit ana
Resolucion conflictos