adds has_many vendors to products, adds has_many products to vendors
fixed merge conflicts in vendor.rb