change question.rb and view
validation
Merge commit '745d4c71523105f964f3af0bd8dcf9a8757b0601'

Conflicts:
	app/models/question.rb