merged
changed user model so that password isn't validated when we're just updating attributes
added views for editing and looking at user account info
fixed two-click checkout
Merge branch 'user_billing_info_views'
fixed merges
worked on categories dropdown
Merge branch 'jdstuff'

Good stuff
fixed form
Merge branch 'master' of https://github.com/chelseakomlo/StoreEngine
fixed categories dropdown
Merge branch 'master' of github.com:chelseakomlo/StoreEngine
deleted raises
add test to ensure filename of email attachment is correct
fixed cart#show page w/ elaine
klkdjflMerge branch 'master' of https://github.com/chelseakomlo/StoreEngine
added a mothafuckin CART!
move test to admin_orders_controller_spec.rb
added index page
fix merge conflict after merging master onto this branch