some user changes
user stuff
Merge branch 'master' of github.com:luckyx1/NACLA_2.0
minor issues
removed logout from profile since its in sidebar
realized I broke user tests. fixed now
more merging!