preguntas
si _o_
Sasa asi
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trivia_TEC/src/Interfaz_TriviaT/VentanaGestion.form
	Trivia_TEC/src/Interfaz_TriviaT/VentanaGestion.java
Merge branch 'master' of https://github.com/byga1402/Proyecto_POO_1