changes to server
changes
Merge branches 'master', 'master' and 'master' of https://github.com/Bluematter/Chat-App