added friendships index to welcome controller
Merge pull request #22 from belindahare/master

added friendships index to welcome controller
merge conflict fix