.....
cadastros
Merge branch 'projeto' of https://github.com/ProjetoLP2/GFP into projeto

Conflicts:
	src/models/entities/Histograma.java
	src/models/entities/ModoDeExibicao.java
	src/models/entities/Relatorio.java
	src/view/Sistema.java