Curriculo completado

He completado el curriculo
Merge branch 'origin/curriculo'