Duplicate
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Matrix.java
	test/MatrixTest.java