We present a new catalog of spectroscopically confirmed white dwarf stars from the Sloan Digital Sky Survey (SDSS) Data Release 7 spectroscopic catalog. We find 20407 white dwarf spectra, representing 19712 stars, and provide atmospheric model fits to 14120 DA and 1011 DB white dwarf spectra from 12843 and 923 stars, respectively. These numbers represent more than a factor of two increase in the total number of white dwarf stars from the previous SDSS white dwarf catalogs based on DR4 data. Our distribution of subtypes varies from previous catalogs due to our more conservative, manual classifications of each star in our catalog, supplementing our automatic fits. In particular, we find a large number of magnetic white dwarf stars whose small Zeeman splittings mimic increased Stark broadening that would otherwise result in an overestimated logg if fit as a non-magnetic white dwarf. We calculate mean DA and DB masses for our clean, non-magnetic sample and find the DB mean mass is statistically larger than that for the DAs.