refs #6: added tests for expected image behaviours
refs #6: added basic support for images, no height or width, or resizing
refs #6: added tests for height/width on images
refs #6: Added support for height and width
Merge branch 'master' into issue_6

Conflicts:
	pydocx/tests/test_xml.py
refs #6: name change, and added a comment
refs #6: refactor, comments, skip tests, all based on review
refs #6: added the travis icon to the readme (hopefully)
Merge pull request #6 from OpenScienceFramework/issue_6

Get images working