commit final
Merge pull request #18 from crisumanyu/master

integración de cristina