modify wiki
add ignore file
文档修改
文档修改
文档修改
文档修改
文档修改
文档修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	theme/static/wiki.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	theme/static/wiki.css