start friendship model
start friendships model
fix merge conflict
make progress in adding friendships
build out ability to request and accept friends