Created login box and added functionality based on whether the user is logged in or not
Fixed merge conflicts