fixed indent issues
fixed formatting
Merge branch 'master' of https://github.com/raffian/jzchat.git
fixed formatting