erik changes
Merge branch 'master' of github.com:CaseRails/python-docx

Conflicts:
	setup.py