clase 3
Merge branch 'master' of https://github.com/schiob/Pycurso2014
clase 3 terminada