fixing cucumber syntax
conflicts
Merge branch 'master' of https://github.com/acrabb/myMood