added a purchase form that doesn't work
adds branch from Davida
added a lot ot the purchase form
rspec up to date
schema changes
Schema merge
fixes merge conflicts
schema update
fixes ellens rspec issue
fixes tests
removes pending tests
fixes merge conflicts
change to user controller
Merge branch 'master' of github.com:Shadae/Scamazon
working on carrierwave
significantly improves show, destroy in purchase and adds some validation
adds image uploader
adds error/notification messages
Changes to user views, models, and controllers
Merge branch 'master' of github.com:Shadae/Scamazon