*Avances punto 7
Merge branch 'master' of https://github.com/duckmanito/so