Added Remove Friend functionality with conditional
Merge remote-tracking branch 'origin/master' into 20140508
Added Remove Friend functionality with conditional
Merge pull request #9 from ltfschoen/20140508

Merge