first
Merge branch 'master' of github.com:blazer000/wechat

Conflicts:
	README.md
ljl