Remover "show" de Encomenda
Merge branch 'master' of github.com:odraude7/ArRails

Conflicts:
	app/views/encomendas/new.html.erb