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

Conflicts:
	test.py
Merge branch 'master' of https://github.com/Zhuoli/SocialComp.HW3

Conflicts:
	spamAnaOnTwitter.py