my error!!
bug
bug
Merge branch 'xiaolong' of https://github.com/rabbitgo/work into xiaolong
bugs
分类
index

就，吗
Merge branch 'xiaolong'

Conflicts:
	script/brand.js
	script/creatorObj.js
	script/homepage.js
	script/main.js
	server/module/article.php