add rubyracer to gems
resolved conflict
gemfile