refine history
modify bugs
refine history
iii
Merge remote branch 'upstream/master'

Conflicts:
	public/build/index.js
	public/index.js
	views/index.jade