HTML work on merchant
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub