chose basic colors for font and links
Merge branch 'master' into rm_front
work on adding items to cart
add ability to remove products from stock
Merge branch 'master' into rm_front
small css tweaks
fix merge conflict
apply stashed change to layout
updated navbar spacing
updated brand position on navbar
add login form
add authenticate method
update user_authentication method
lots of crap
Merge pull request #22 from brigid2718/steph_monday

Steph monday
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
add current_order to application controller