conflict commit 2
Merge branch 'master' into Conflict

Conflicts:
	TestDocu.txt