Solves merge conflict
Merge branch 'master' of github.com:enoex/realtime-chat-benchmarks