teste
teste2
tenso
Merge branch 'master' of https://github.com/SadaoYokoyama/relatorio

Conflicts:
	bin/.gitignore
	bin/JFramePrincipal.class
	bin/equipamentos/Equipamentos.jrxml
	bin/professores/Professores.jrxml
	bin/salas/sala.jrxml