did some stuff.
Merge branch 'master' of https://github.com/Maome/TwitterDataMine

Conflicts:
	parse.py