Merge branch 'master' of https://github.com/carinaboo/homie
Merge branch 'master' of https://github.com/carinaboo/homie
Merge branch 'master' of https://github.com/carinaboo/homie
added cucumber tests for editing user
Merge branch 'master' of https://github.com/carinaboo/homie