minor code changes. nothing important.
Merge branch 'master' of https://github.com/gravetii/Chat