work on adding items to cart
fix merge conflict
apply stashed change to layout
work on adding items to order
Merge branch 'master' into bri-add-order-item-to-order
check for current user in application controller, move login form to header
add authentication to login
Merge branch 'master' into bri-login
style login status
update root_url to root_path
Merge pull request #24 from brigid2718/bri-login

Bri login