renamed localmerchant with merchants.html
renamed localmerchant
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub

Conflicts:
	localmerchants.html
	merchant.html
	merchants.html
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
merchant page progress edit
edit two merchants page
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub