Alterando o arquivo de lotes
Merge remote-tracking branch 'origin/master'

Conflicts:
	teste.js