add
Merge branch 'master' of https://github.com/Zhuoli/SocialComp.HW3

Conflicts:
	crawler.py
	settings.py