updated
Merge branch 'master' of https://github.com/asu-cis-355/matrix