fixed order page so that when an invalid input is typed into the field it re-renders the orders page
add to application controller that a new order is created if one does not already exist
Merge branch 'master' into bri-click-on-empty-cart
add column for order status
product partial on home page
add pending to order initialization
merchants partial on homepage
order checkout columns being updated through final_countdown method
validate checkout information works. yay
unknown change
update stock quantity
clear cart, validate oder fields and directed to confirmation page
small change
twitter styling
Merge pull request #43 from brigid2718/rm_thursday

Rm thursday
fix merge conflicts
Merge branch 'master' into steph_thurs
Merge branch 'master' into bri-click-on-empty-cart
Merge pull request #44 from brigid2718/steph_thurs

Steph thurs
divs and extra end statements in order index html