stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/far_mar_finder.rb
	lib/product.rb