Removed paperclip init
Merge branch 'master' of github.com:wvmitchell/dinner_dash
Use aws in development
AWS now functional on production and development
Added feature to allow checkout for current order, on checkout user can see all completed orders
Merge pull request #21 from wvmitchell/working_on_checkout

Added feature to allow checkout for current order, on checkout user can ...
Allow unauthenticated users to create account, and add link to account creation on login page
Added appropriate authentication and authorization to orders controller
User is now automatically logged in after creating account
Fixed bug causing flash message to be incorrect on add to cart
Merge pull request #22 from wvmitchell/bug_fixes

Various bug fixes, see individual commits
Fixed infinite redirect caused by require_login on new order action
Merge pull request #23 from wvmitchell/bug_fixes

Fixed infinite redirect caused by require_login on new order action
Fixed bug preventing order from being shown by unauthenticated user
Merge pull request #24 from wvmitchell/bux_fix

Fixed bug preventing order from being shown by unauthenticated user
conflicts fixed