Merge branch 'master' of github.com:andres-erbsen/chatterbox

Conflicts:
	README.md