resolve all conflicts
add untracked file
add user log in functionality
delete unusefull model BasicAuth
store user info in session