Escalonador de Eventos
Merge remote-tracking branch 'origin/master'

Conflicts:
	miniteste4_gerador/src/miniteste4_gerador/Main.java