added friends page
trying to resolve merge conflicts
added friends page, ignore previous commits from me