Aaron's changes with individual Add to Cart button
Merge branch 'master' of https://github.com/nychinn/goldfish