Session changes
Solve merge conflicts
User login
Merge changes
Sign in and out functionaality