Minor change, still need to add restriction where friend requests cannot be sent if you are already friends
Merge remote-tracking branch 'origin/master'