login method in users_controllers
routes.rb merged