An overview of rigidity theory roughly following the history of the subject. The role of rigidity in the conception of matroid theory and the role of matroid theory in the development of rigidity will be explained. The talk will end with a discussion of the open questions in combinatorial rigidity.