Merge branch 'patch-1' of https://github.com/riffraff/FrameworkBenchmarks into PR665

Conflicts:
	rails/app/controllers/hello_world_controller.rb

rails/app/controllers/hello_world_controller.rb

@@ -23,7 +23,7 @@ class HelloWorldController < ApplicationController
   def fortune
     @fortunes = Fortune.all
     @fortunes << Fortune.new(:id => 0, :message => "Additional fortune added at request time.")
-    @fortunes = @fortunes.sort { |x, y| x.message <=> y.message }
+    @fortunes = @fortunes.sort_by { |x| x.message }
   end
 
   def update