added bob loblaw
fixed conflict in best_friend.txt