agregado diff
Merge branch 'master' of github.com:aledruetta/HowTo