zj first
output state and count of topic
Merge pull request #7 from JohnaLiu/zhijiao_branch

zj first
Merge pull request #10 from huangbolun/master

Merge pull request #6 from huangbolun/zhijiao_branch
Merge pull request #11 from huangbolun/zhijiao_branch

Zhijiao branch new code
Merge pull request #12 from huangbolun/qinbo_branch

Qinbo branch
Merge pull request #13 from huangbolun/master

new to bolun
Merge pull request #14 from huangbolun/bolun_branch

Merge pull request #13 from huangbolun/master
Merge pull request #2 from huangbolun/bolun_branch

heatmap and term vector
Merge branch 'master' of ssh://github.com/huangbolun/topic_tweet_analysis
tfidf code added.
modified hits.py
histogram
Merge pull request #1 from huangbolun/master

parse_time.py
Merge pull request #3 from Turmac/master

histgram