most recent updates
product ownership is starting to work
merging new stuff in
fixing merge conflicts
Merge branch 'master' into davida_products
cannot add to cart if stock is 0