merge
update01/05/02
Merge branch 'master' of https://github.com/psyclaudeZ/ML14-Project into jingxin

Conflicts:
	Code/data/tweets
	Code/src/tweet_cleaner.pyc