switch preguntas
Merge branch 'master' of github.com:acrogenesis/DynamicTeacher

Conflicts:
	db/seeds.rb