Matrix stuff works. Problems with displaying.
Merge branch 'master' of https://github.com/stuydw/matrix