cosas
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trivia_TEC/build/classes/Interfaz_TriviaT/CursosDeProfesor.class
muchas cosas
Merge branch 'master' of https://github.com/byga1402/TRIVIA

Conflicts:
	Trivia_TEC/build/classes/Interfaz_TriviaT/CursosDeProfesor.class
	Trivia_TEC/nbproject/private/private.xml