Determinar conflictos
Merge pull request #5 from jesm00/jorge

Determinar conflictos