KAPES SE EQUIVOCO EN NOKOGIRI
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
Bootstrap y weas
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3 into martin
merge deletes
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
probando
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
pico
LISTO SERVIDOR
ARREGLANDO TODO DENUEVO
Merge branch 'martin' of https://github.com/baicunko/TallerIntegracion3 into martin
merge de mierda
FUNCIONA, NO LO DESTRYAN
EL MIO FUNCIONA
AA
merge conflict numero infinito
merge merge
merge conflict
ODIO LOS END