Merge branch 'master' of https://github.com/Gilbert09/ScrollsChatClient.git
Merge branch 'master' of https://github.com/Gilbert09/ScrollsChatClient.git