Formatting
Merge branch 'master' of github.com:nkbt/messenger