more stuff working :relaxed:
Merge branch 'master' of github.com:blasterbug/Octochat
 merde!