#Commit
#Commit - Verifique a senha e userdo bd
Merge branch 'master' of https://github.com/le-abreu/PedidoOnline.git

Conflicts:
	Empresa/WebContent/content/pag/rHfuncionarioList.xhtml