uploaded the correct file
Merge branch 'master' of https://github.com/anderZubi/TuentiChallenge2014
Upload correct file