<<<<<<< HEAD <<<<<<< HEAD 19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587 ======= 6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b >>>>>>> 8ad9dc6 (faltan controladoras) ======= 099b8681c0fe3ea241c3236b037e92bb2b80c449b64984e5089c2c47a48ee0b9 >>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)