What was the Great Compromise during the Constitutional Convention?

The House of Rep would be based on population. The Senate would have two members from each state.