fisrt version
Merge branch 'master' of https://github.com/calvinvbigyi/Matrix-Calculator

Conflicts:
	js/Matrix.js