DEAL-006 completely done
.idea
DEAL-010: Generar preguntas terminado
DEAL-010 pantalla de preguntas terminada
Merge branch 'DEAL-010' of https://github.com/lauralb/dealhunter into DEAL-010

Conflicts:
	.DS_Store
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/dealhunter.iml
	.idea/workspace.xml
	db/schema.rb
	lib/.DS_Store
Game 1 vistas
vistas game 1
timer
DEAL-010
DEAL-010
Merge conflicts