final
Merge branch 'master' of https://github.com/rk2900/weibo_bigdata

Conflicts:
	src/weiboMachine.java

	modified:   src/weiboMachine.java