Update test.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.txt
add line

add another line
Merge branch 'KannCBranch'