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 #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