merged
init
Merge branch 'rails' of github.com:goalsin/chat_api into rails