cop-outs now update operatorTop and operatorBottom
Merge branch 'master' into create-wrong-answers

Conflicts:
	bin/RMI_Main.class

Merge again!