Subiendo el reto 3
Merge https://github.com/jesantana/tuenti2012