new branch version

#1
Merge branch 'testbranch'

Conflicts:
	testdoc.docx