Update show.html.erb

sort by merchant_id
Update _menu.html.erb

Adding menu item for vendors and tariffs
first commit
first commit
fix
fix
about company
merge conflict