before pull
Merge branch 'master' of https://github.com/lrhodin/beesneeds
added user account cucumber tests, added user name to user model