silly diagrams
diagrams
Merge branch 'feature-diagrams' into feature-all

Conflicts:
	docx/__init__.py
	docx/oxml/__init__.py
diagrams
Merge branch 'feature-diagrams' into feature-all

Conflicts:
	docx/parts/diagram.py