added accepted_friends
committing merged user.rb
added friend.feature cucumber tests (no step defs yet)
adding friend cucumber tests
Merge branch 'master' of https://github.com/ronde-app/ronde