chat demo broken for unknown reason
can send messages
merging message functionality to master
added chat but broke it and messaging
chat & messages work again
mergin carter's local changes into remote
merging remote into local
merging remote into local