changed django settings, added db, added data scraping tools
merged