small changes
Merge branch 'master' into javascript
Doing things
Merged conflicts
Working login and logout