Merge branch 'master' of github.com:fwjyttbtx/ChatApp

Conflicts:
	Readme.md