commit for tom
added row (and column... sort of) span
Merge branch 'master' of https://github.com/tow/python-docx

Conflicts:
	docx.py
Merge branch 'master' of https://github.com/spukst3r/python-docx