everything should be working
deactivate logic working
it'sreally really working i think maybe
user not userusername
removed nil
merged conflicts
Merge branch 'master' into addSignup