Teste 2
Teste
teste
Teste
Merge branch 'teste'

Conflicts:
	sistema-vendas-jquery/js/pdv.js
Merge branch 'master' of https://github.com/danielps/livroRESTful

Conflicts:
	sistema-vendas-jquery/js/pdv.js