another attempt to fix images without amazon-aws
Apparently heroku wasn't using puma or passenger without the Procfile
Pull in navbar changes
refactor save on seed items
first attempt, hopefully this works
set user_id to nil if user for user_id in session doesn't exist
fix current_user again, remove extra current_user from base_admin_controller
Merge pull request #91 from larsonkonr/fixing-styles

Fixing styles
IDs must be unique in order to validate
url(filepath) won't work on prod, have to use asset-url('filename')
add better errors gem for irb at point of error in browser
add total cost to cart view, pushed logic down to cart model
add cart spec, add total column to order table
uh, here's the cart spec and total column migrations :p
Merge pull request #90 from larsonkonr/amazon-aws

Amazon aws
Merge pull request #92 from larsonkonr/html-validation

Html validation
Merge branch 'master' into checkout-flow

Conflicts:
	Gemfile.lock
Merge pull request #93 from larsonkonr/checkout-flow

Checkout flow
Implemented database cart
Created OrderCart that behaves like Cart but saves to the DB
Implemented CartOrderConverter to convert from Cart to OrderCart
Added a state machine gem (AASM) to track order status and prevent incorrect state changes

This means we can use the following methods to ask an order about its state:
  ordered?
  may_place?
  cancelled?
  may_cancel?
  completed?
  may_complete?
  paid?
  may_pay?

And we can use the following to change an order's state:
  place!
  cancel!
  complete!
  pay!
Merge branch 'master' into checkout-flow