No need for userSocket var in client since already have socket; now using socket.id now and thus needed to reintroduce loggedIn var
merge