modificaciones mínimas
Merge branch 'johnlegion' of https://github.com/pokaxperia/itdp into johnlegion