fixes #15
cleanup merge
Merge branch 'master' of github.com:sealocal/cf-schwag-store
merging test for add-to-cart on show page
Merge branch 'master' of github.com:sealocal/cf-schwag-store