base de datos
Merge branch 'master' of https://github.com/eumati/res-node