update current_user and current_order to handle bugs
Merge branch 'master' into bri-order-does-not-exist-error-fix
Merge pull request #52 from brigid2718/bri-order-does-not-exist-error-fix

update current_user and current_order to handle bugs