six
Merge remote-tracking branch 'upstream/master'

Conflicts:
	haoshimai/node_modules/.bin/uglifyjs
	haoshimai/node_modules/uglify-js/package.json
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from jarvys/master

修改样式
x
x
y
Merge pull request #6 from longyueyi0610/master

fix bug
修改样式
忽略haoshimai/backup
Merge remote-tracking branch 'upstream/master'
修改