stuff
fixed
fix merge
Working relat bt vendor and market
Merge branch 'master' of https://github.com/katke/farmar-rails