X-Ray Astronomy 2000