styling
Merge branch 'master' of github.com:lidsky/ChatApp