ignorar directorio
Merge branch 'master' into merge_tablas