merged, fixed and commented adriana and me
commit final del jueves