Change on MatrixTesting to force manual merge.
Trying to force manual merge (this is on MatrixTesting)
Merge branch 'MatrixTesting'

Conflicts:
	Matrices/src/matrices/MatrixTester.java

Should have incorporated text from both branches.