Test Commit #4
Merge branch 'origin/test2'

Conflicts:
	Test.txt (resolved)