Albert Einstein developed the General and Special theory of relativity and introduced the concept of mass-energy equivalence (E = mc^2).