Merge pull request #2 from tuxianof/master

Actualizacion ultima
1105G

sE QUITO GATO
Merge pull request #3 from cristianh/master

1105G