resuelto conflicto
Merge pull request #2 from dav009/feature/caracteristica2

agrege caractistica 2