Merge branch 'master' of github.com:dominikgrygiel/FrameworkBenchmarks into dominikgrygiel-master

rails/app/controllers/hello_world_controller.rb

@@ -1,4 +1,7 @@
-class HelloWorldController < ApplicationController
+class HelloWorldController < ActionController::Metal
+  include ActionController::Rendering
+  include ActionController::Renderers::All
+
   def json
     render :json => {:message => "Hello World!"}
   end
@@ -13,4 +16,4 @@ class HelloWorldController < ApplicationController
     end
     render :json => results
   end
-end
+end