NewBranch
New file on NewBranch.
Merge branch 'NewBranch'

Conflicts:
	NewBranch.txt