Put merchant sections in merchant
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub