Added rubyracer and less-rails in gemfile
Removes merge conflict in Gemfile.lock