added updateFriendship to Friend, updatedFriendship when submitting quiz, and changed friendshipExists in Friend to return id of friendship
attempting merge