Committing what I have of HW7#8

flowersw wants to merge 6 commits intotiyd-python-2015-05:mastertiyd-python-2015-05/matrix-objects:masterfrom

flowersw:masterflowersw/matrix-objects:masterCopy head branch name to clipboard