name added to best_friend.txt
git merged