Latest version from Cristi
Merge branch 'master' of https://github.com/tigerss/FitnessChallenge into dev