Fix merge issues

Merge branch 'master' of https://github.com/craigjmcgowan/cdcfluview

# Conflicts:
#	R/get_hosp_data.R
#	man/get_hosp_data.Rd

R/get_hosp_data.R

@@ -113,6 +113,7 @@ get_hosp_data <- function(area="flusurvnet", age_group="overall",
     # so help them out and move the year back and get current flu
     # season data.
 
+
   return(file)
 
 }

man/get_hosp_data.Rd

@@ -13,6 +13,7 @@ digit state abbreviation for an individual site. Exceptions are
 New York - Albany ("\code{nya}") and New York - Rochester
 ("\code{nyr}")}
 
+
 \item{age_group}{a vector of age groups to pull data for. Possible values are:
 "\code{overall}", "\code{0-4y}", "\code{5-17y}, "\code{18-49y},
 "\code{50-64y}, "\code{65+y}".}