基本框架完成
Merge branch 'master' of https://github.com/gsh199449/WeiboGather

Conflicts:
	src/main/java/com/weibo/weiboGather/App.java