commit 2014-02-15 11:52:38 pm
nuevos cambios
general
generales
Merge https://github.com/darkzdiez/ds