Corrigido erros
Corrigindo commit
Merge branch 'master' of https://github.com/SadaoYokoyama/relatorio.git

Conflicts:
	bin/.gitignore
	bin/JFramePrincipal.class
	bin/JPanelAlunoTotal$1.class
	bin/JPanelAlunoTotal.class
	bin/JPanelTipoEquipamentoTotal.class
	src/JFramePrincipal.java
	src/JPanelTipoEquipamentoTotal.java