An example for Tianya
conflict
Merge branch 'dev' of https://github.com/cwhy/js_forum_analyser

Conflicts:
	retriever.js
sync status