Resolvendo conflitos em fachada;
Merge branch 'master' of https://github.com/vbwarley/ProjetoPOOGRS

Conflicts:
	ProjetoPOO - GRS/src/negocios/Fachada.java