push to GitHub
Merge branch 'master' of https://github.com/junfeng-hu/sockchat

Conflicts:
	.gitignore