Merge remote-tracking branch 'origin/david' into ushhud

Conflicts:
	index.html
Preliminary chat, maybe good enough for demo..?

- Preliminary chat capabilities
Olo