Merge branch 'master' of https://github.com/BlueRubberDucky/Project-4

Conflicts:
	QuaternaryMatrixOperations.java
j