Timer prueba 1
Merge branch 'master' of https://github.com/marcorivm/GenRap

Conflicts:
	app/views/exams/edit.html.erb