first commit
Merge https://github.com/nickson987/matrix