added redis to .gitignore
Merge branch 'master' into messaging
added .idea folder to .gitignore
Merge branch 'master' into messaging
updated .gitignore with upload folder
Merge branch 'master' into messaging
app/controllers/messages_controller.rb