Redefinir limite de casas nos campos de preço
Merge branch 'master' of github.com:odraude7/ArRails

Conflicts:
	app/views/encomendas/new.html.erb
Merge branch 'Frontend'

Conflicts:
	app/views/encomendas/new.html.erb
Remover "show" de Encomenda
Merge branch 'master' of github.com:odraude7/ArRails

Conflicts:
	app/views/encomendas/new.html.erb
Busca por codigo
Merge branch 'master' into Frontend
UooooooooooU
Limpar arquivos não utilizados
TicoMia
Merge branch 'master' of https://github.com/odraude7/ArRails.git
Txoba