。。。。
更新
Merge branch 'master' of https://github.com/iStove/Collection

Conflicts:
	.idea/workspace.xml
	caiji2.js
更新