Update conferences_controller.rb
Merge pull request #1 from reneric/master

Update conferences_controller.rb