generales
Merge branch 'master' of github.com:darkzdiez/test