authentication controller, sessions controller
User Auth
Resolved Merge Conflict