new feature
Merge branch 'mynewbranch' into test

Conflicts:
	doc1.txt