fix conflict
Merge branch 'master' of https://github.com/acsalu/nmlab-chatr00m