Matrix added
Revert "Matrix added"

This reverts commit 84b8b1a07ee6795dd927436919a380aec0f60506.
Revert "Revert "Matrix added""

This reverts commit 1d69df7708dccf89eb940109b50b9efab1cfda53.
Merge origin/master

Conflicts:
	src/utils/Matrix.java