added loop to display friends
fixed merge error in index.html.haml
Merge pull request #28 from belindahare/master

added loop to display current user's friends