emmm...muchos cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trivia_TEC/build/classes/Interfaz_TriviaT/PreguntaFV.form
	Trivia_TEC/src/Interfaz_TriviaT/PreguntaFV.form
	Trivia_TEC/src/Interfaz_TriviaT/PreguntaFV.java