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

Conflicts:
	crawler_base.py