putting everything up to date
Merge branch 'master' of github.com:Shadae/Scamazon