Change2
Merge branch 'master' of https://github.com/Spirit30/TestRepo

Conflicts:
	Doc.txt