Merge pull request #49 from belindahare/master

changes to show.html.haml
moved user list, added friends title to box 4