Add friend model
modify view and controller
Update users model
Drop old table Friends_Users
Scaffold specs and factory
Add route to accept friendship
Show unaccepted requests iin friends#index
Update friends controller to accept a friend request
Merge branch 'master' into friends-connection
merge stil failed
Merge branch 'friends-connection'