Test 'Hello'
add 'new.txt'
Merge branch 'Ray'

Conflicts:
	textfile.txt