Added user login, logout, and fixed the routes to work
fix merge conflicts