modify bugs
iii
Merge remote branch 'upstream/master'

Conflicts:
	public/build/index.js
	public/index.js
	views/index.jade
Merge pull request #21 from lucknessbuaa/master

modify the tablist