commit
Merge branch 'master' of https://github.com/vinc38/jChat.git