login and logout work
Merge branch 'master' of github.com:reallocate/reallocate
fixing merge
Merge branch 'master' of github.com:reallocate/reallocate