Merge branch 'master' into colores_de_windows
Merge branch 'master' of github.com:codificadas/docs