refactor merchandise
Merge branch 'merchandise' of sonnyg-atxid:connect2good/c2g-beta into merchandise