added rspec and revised uesrs view
Merge branch 'master' into friends
added friendship controller and updated views
fixed delete friend link
Merge pull request #6 from 12days/friends

Friends