fixed link in bookmarks view
merge conflict
userController fixed to login correctly
this is the controller