\Merge branch 'beta' of https://github.com/krzyk240/chat into beta
Merge branch 'beta' of https://github.com/krzyk240/chat into beta