edits
Merge branch 'master' of github.com:slee312/chat_app
added mongoid
changes