cambios en el db/schema
merging db/schema
Merge branch 'master' of https://github.com/israelantezana/yosistemas