add markets controller and view
fix merge conflict in routes.rb