<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973 ======= 390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af >>>>>>> 8ad9dc6 (faltan controladoras) ======= a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac >>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) ======= 1589bc3738d4d92e8df1687e356ae3d2c87cb333 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))