Added users and associated tests
Renamed user_friendships to user_friendship. Previous commit message should read, 'Added user friendships', not 'users'