Ediçao do marketing action #5 Modificaçao do seeds.rb #18
Adiçao do delete.erb #5
Merge branch 'campanha'

Conflicts:
	db/seeds.rb