atualização
resolver conflitos
Merge branch 'master' of https://github.com/gleisonbt/controleVendas.git

Conflicts:
	conf/routes