What was the name of the famous researcher ...?

who set the psychological world on its ear with his experiments in the 1960s? They were considered highly unethical as they involved a subject shocking a confederate (unbeknownst to the subject) until death. And what ever happened to the Dr.?