conflict test
Merge branch 'master' into Conflict

Conflicts:
	TestDocu.txt
Merge pull request #5 from jschmer/Conflict

conflict test