cambio de lugar
Merge remote-tracking branch 'origin/david/cambiosQls'