log user in if session is still active
Merge branch 'master' of github.com:TheyShouldHaveATeam/TheyShouldHaveThis