Departamento Individual finalizado
Merge branch 'master' of https://github.com/SadaoYokoyama/relatorio

Conflicts:
	bin/.gitignore
	bin/salas/sala.jrxml