add current_order to application controller
add functionality to check for current order using session or create new order if one does not exist
Merge branch 'master' into bri-add-order-item-to-order
add cart status to header and some styling
fix merge conflict, delete commented things from application controller
Merge branch 'master' of https://github.com/brigid2718/goatique into bri-add-order-item-to-order
add order_item.find_by_product_id_and_order_id to order items controller
Merge branch 'master' into bri-add-order-item-to-order
fix order of product_id and order_id when updating quantity of items in order item in order item controller
add method to order model that calculates total number of products
remove before_filter from order model
Merge pull request #26 from brigid2718/bri-add-order-item-to-order

Bri add order item to order