Updated SolutionTest and OrTreeNode
Merge branch 'master' of https://github.com/akmadsen/sisyphus1.git

Conflicts:
	Sisyphus1/src/cpsc433/OrTreeNode.java