my first commit
Added shoulda to test group
Added bin to .gitignore
Added user friendships and associated test
Unknown conflict