fixed class vars
updated shopping cart and product to contain discount, remove onj from hopping cart
Merge branch 'master' of github.com:rubydoobydoo/meetings