new file change

#1
Merge branch 'testbranch2'

Conflicts:
	testdoc.docx