fixing overwrite problems
Merge branch 'master' of github.com:Shadae/Scamazon
category fix
uodates
merge conflicts