added friends functionality nigga
fix merge conflicts