Revert "Revert "Entrega 1""

This reverts commit 698ed8040dcd54a138871c3df88c3b4ba6f191d3.