User updatebefore user id addition
Merge branch 'master' of github.com:Shadae/Scamazon
Merge branch 'master' of github.com:Shadae/Scamazon into shadae_users
Merge branch 'master' of github.com:Shadae/Scamazon
Merge branch 'master' of github.com:Shadae/Scamazon
Merge branch 'master' of github.com:Shadae/Scamazon
Merge branch 'master' into shadae_users
image files in folder
hopefully not-buggy user stuff
fixes merge conflict
fixes missing notification
placing order reduces stock
Merge branch 'master' of github.com:Shadae/Scamazon
Merge branch 'master' into shadae_users
change users
Merge branch 'master' of github.com:Shadae/Scamazon
solves order user_id problem
order status
fixes merge conflict
working on sessions and guest cart