first commit
Merge branch 'master' of github.com:Shadae/Scamazon
Merge branch 'master' of github.com:Shadae/Scamazon
Changes to User section
changes to user's section
Changes to schema and routes after merge error