Merge pull request #4 from danielcfe/master

ge
Merge branch 'master' of https://github.com/xleninx/proyecto