Cambios en seleccion de preguntas
Merge branch 'master' of https://github.com/marcorivm/GenRap

Conflicts:
	app/views/master_questions/index.html.erb