settings
Merge branch 'master' of https://github.com/omastroberti/ProyectoFinal
Merge branch 'master' of https://github.com/omastroberti/ProyectoFinal
Merge branch 'master' of https://github.com/omastroberti/ProyectoFinal
Merge branch 'master' of https://github.com/omastroberti/ProyectoFinal
Merge branch 'master' of https://github.com/omastroberti/ProyectoFinal
fix modelo, admin,  y BD actualizada
diff resolved