Fixed functions
Merge branch 'master' of https://github.com/freshcelery/10_hero_challenge

merging files