subtotal sort of works
got shopping cart logic to work
committing to merge dev3
About to do a scary merge
shopping cart logic works
Merge branch 'shoppingCart2' into dev3
Merge branch 'dev3' into popAnimationsBranch
plays video version to height size of device