Push from amy
Merge branch 'master' of github.com:GustavoCaso/validations

Conflicts:
	app/models/question.rb
	app/views/exams/new.html.haml