Modificando clase PantallaPrincipal
Merge remote-tracking branch 'origin/HEAD'
Merge remote-tracking branch 'origin/HEAD'