Which plan of government called for a two-house legislature; the upper house would have equal representation, and the lower house would have representation bas?