friendship half working
all tests passing for followed and following
cleaned up user spec
merged friendships models into development and fixed merge conflicts