This paper summarizes recent results in X-ray and γ-ray astronomy including measurements of galactic and extragalactic sources from 0.1 keV to 20 GeV from space, measurements of γ-rays at energies above 70 GeV from the ground as well as theoretical models for the emission of γ-rays and X-rays in galactic and extragalactic sources. The majority of the new results presented at this conference were made with ground-based γ-ray detectors, with relatively few new results from the Compton Gamma-ray Observatory (CGRO) and other space-based instruments. Many of the results involve multiwavelength studies which combine ground-based γ-ray measurements with space based X-ray and γ-ray measurements. The main topics covered in this paper include observations of diffuse γ-ray emission from the galaxy, observations of blazars, γ-ray bursts, supernova remnants and pulsars as well as theoretical models for the emission mechanisms of these sources.