merging
still merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/solvers/SORSolver.java
	src/testing/MainTest.java