Busca por codigo
Merge branch 'master' into Frontend
UooooooooooU
TicoMia
Merge branch 'master' of https://github.com/odraude7/ArRails.git
Merge branch 'master' of https://github.com/odraude7/ArRails.git

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