Make the login and logout work
Added ignore files
Recover from a mistaken delete
Fixed the conflicts again
Removed the now ignored directory again...