seeds + hope this works
Merge branch 'master' of github.com:tarmac/bootprod

Conflicts:
	app/models/product.rb
	db/seeds.rb