adds goodbye.txt
Merge branch 'non_tracking'