add new file test.txt
add line to test.txt
add jj to test.txt
change test.txt to merge
add .gitigonore