Merge conflicts.
Merge branch 'master' of https://github.com/RockyCal/CINERGIWebCrawler
Merge conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	crawler_base.py
Merge conflicts resolved.