minor changes, basic chat finished
Merge branch 'master' of github.com:akumagamo/basic_chat

Conflicts:
	README.md