wrote update method for markets controller
hooray merge!
Merge branch 'master' of https://github.com/katke/farmar-rails