sizes for merch are now strings, not enums because I can't figure them out and I'm tired
Merge branch 'master' of https://github.com/mteaster/test