Refactored friendhip
Merge pull request #4 from Plantigoshi/FriendshipRefactor

Refactored friendhip