Make the login and logout work
Added ignore files
Fix the conflicts