working order total
Merge branch 'master' of github.com:lizrush/congo into orders
updated confirmation page including order status and other goodies
changed cart to my cart and orders formatting
updated with sue's current user
Merge branch 'master' of github.com:lizrush/congo into orders

Conflicts:
	db/schema.rb
more orders stuff
fixed merge conflicts
Merge branch 'master' of github.com:lizrush/congo into orders
cleaned up orders
fixed merge conflict in cart
fixed merge conflicts