Supernovae and Gamma-Ray Bursts