merge commit
Merge branch 'master' of https://github.com/mgsholte/PSsolver.git

Conflicts:
	src/testing/SORTest.java