Revert "Merge branch 'Entrega3'"

This reverts commit c29ada2c227c66416580bccfdce622d173bd3034, reversing
changes made to 838ff805f72f2cd622b440fb0bf34d50e7acc745.
reverted