Merge pull request #45 from belindahare/master

fixed friends list and changed where they are displayed