nada
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/testes/TestaGerenteDeCategorias.java
	src/testes/TestaGerenteDeUsuarios.java