Fixed some scoring bugs.

Boolean AND instead of OR for evaluating which permutation of cuts is
best scoring.

Signed-off-by: Ken Hoover <ken.hoover@mail.utoronto.ca>
Prepared for adding days.

Signed-off-by: Ken Hoover <ken.hoover@mail.utoronto.ca>
Merge remote-tracking branch 'origin/master'

Conflicts:
	rop-game/src/com/kandl/ropgame/model/Group.java