added bestfriend 2
merged conflicts in best_friend.txt