Merge pull request #1 from longyueyi0610/master

commit
Merge pull request #2 from longyueyi0610/master

fifth
完善首页
Merge pull request #3 from jarvys/master

完善首页
Merge remote-tracking branch 'upstream/master'

Conflicts:
	haoshimai/node_modules/.bin/uglifyjs
	haoshimai/node_modules/uglify-js/package.json