Update quiz.rb
Update quiz_spec.rb
Quiz changes.
Merge branch 'master' of github.com:tibbon/ga-method-conditional-quiz

Conflicts:
	quiz.rb
Quiz.rb.