added some text
Merge branch 'master' of github.com:basemj/TestSubModule

Conflicts:
	doc2.txt