Adds friend
Merge branch 'FriendJoins', added new friend.