chat mostly works but no user labels
trying to get names
chat fully works
init 259
fixed conflicts 403
fixed conflicts 405
Merge branch 'chat_peter'