renamed localmerchants to merchants html
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
renameing of merchants tml
old file do not mess with
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub