Javascript things
Merge branch 'chris'
Fixed some things in order to pass tests
logout -> log_out
Test fix
Merge branch 'chris'