Initial commit
Merge https://github.com/ninjalf2/matrix