create user cucumber tests
fixed conflict
log conflicts...
Merge branch 'master' of https://github.com/acrabb/myMood