schema changes
Schema merge
change to user controller
Merge branch 'master' of github.com:Shadae/Scamazon
Changes to user views, models, and controllers
Merge branch 'master' of github.com:Shadae/Scamazon