col row col span working
updating
should work
current
setting attributes
flake8
Merge branch 'issue_14' into col_row_attrs

Conflicts:
	pydocx/DocxParser.py
refs #15: code refactor, with passing tests
refs #15: fixed comments, small refactor with how the table cell is being rendered.
refs #15: code refactor, cleaned up code
refs #15: removed another skip test, nested tables with row/col spans is working
Merge branch 'master' into issue_15

Conflicts:
	pydocx/DocxParser.py
refs #15: fixed a wonky comment
refs #15: no longer doing way extra operations when settings indexes
refs #15: how long does travis say this takes?
refs #15: bumped the time of the test, and skip the test unless on travis
refs #15: fixed a typo
Merge pull request #15 from OpenScienceFramework/issue_15

Table row/col spans