Fixes en GUI
Merge branch 'master' of github.com:itolosa/tarea1bd

Merge cambios del Nacho