Cambios en productos
cambios 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/app/views/bikes/new.html.erb