eee
Merge branch 'bug'

Conflicts:
	doc01.docx