Fixed Diamond brackets screw you marcus
Merge branch 'master' of https://github.com/zikhanexe/2d-sat

Conflicts:
	src/sat/SATSolverAlgo.java