Paired programming work. Updated Gemfile to Rails 4
Merged sites_controller.rb