readme
Merge branch 'master' of https://github.com/JiaoLiu/WeChat

Conflicts:
	README.md