reject friend request works now
Merge branch 'christopher'