promocions
Merge branch 'master' of https://github.com/meijing/toxo

Conflicts:
	app/models/product.rb