updating README
Merge branch 'master' of github.com:keppelen/chatty

Conflicts:
	README.md
Merge branch 'master' of github.com:keppelen/chatty