Made test.txt

Learning how merges work