two projects; one is box2d, one is not, to hand merge