ssss
Merge branch 'master' of https://github.com/tufu/weifengnews

Conflicts:
	.DS_Store