Merge pull request #8 from LouisaBarrett/refactor

Make instance variables for approved and pending friends
Set up associations btw Friendship and User