Merge pull request #1 from lucknessbuaa/master

add the news page
save
refine news view
merge
解决shim 脚本的配置问题
save
iii
Merge remote branch 'upstream/master'

Conflicts:
	package.json
	public/build/index.js
save
add the third page
Merge remote branch 'upstream/master'