filling out mm_multiply
fixing merge conflicts in Matrix.java