muchas cosas
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trivia_TEC/build/classes/Interfaz_TriviaT/VentanaPreJuego.form
	Trivia_TEC/nbproject/private/private.xml
muchas otras cosas
Merge branch 'master' of https://github.com/Musiktt/TriviaTEC

Conflicts:
	Trivia_TEC/src/Interfaz_TriviaT/CursosDeProfesor.java