added content to gem for Heroku deployment
changes to Gemfile for jRuby and new procfile
changes to gemfile for jruby
changes to procfile
merging conflicts