ejc;modificado;29-03-2014
Merge branch 'master' of https://github.com/lemus27/mgl-proyecto-nodejs
Merge branch 'master' of https://github.com/lemus27/mgl-proyecto-nodejs