Merge branch 'master' of https://github.com/RockyCal/CINERGiWebCrawler

Conflicts:
	.idea/workspace.xml
	crawler_base.py