friends list
fixed merge error
Merge pull request #47 from belindahare/master

worked on friends list display