ajuste da tela curso
Merge branch 'master' of https://github.com/hudsama/trabalhofinalPOO

Conflicts:
	build/classes/Telas/TelaPrincipal$1.class
	build/classes/Telas/TelaPrincipal$2.class
	build/classes/Telas/TelaPrincipal$3.class
	build/classes/Telas/TelaPrincipal$4.class
	build/classes/Telas/TelaPrincipal$5.class
	build/classes/Telas/TelaPrincipal$6.class
	build/classes/Telas/TelaPrincipal$7.class
	build/classes/Telas/TelaPrincipal$8.class
	build/classes/Telas/TelaPrincipal.class
	nbproject/private/private.xml

arquivos apagados