Testing deploy on Heroku
Testing deploy on Heroku
merging conflicts
Modifying rails version and switching to thin
This is to allow using Faye-rails to allow real time notifications