routes change
Merge branch 'master' of github.com:Shadae/Scamazon
merge conflicts
User can now log out Woo
Merge conflict on user
adds cart
merging in cart
working on add to cart
Merge branch 'master' of github.com:Shadae/Scamazon into davida_products
adds quantity field for show page