added date parsing
resolved conflict
adding dump from webscraping
fixed merge