Update quiz.rb
Uncommented binding.pry
Fixes merge conflicts