add other_file.txt
add GOOD.txt
add BAD.txt
Merge branch 'Diane'